Merge commit 'upstream/0.1.6' into master.experimental
authorMatteo F. Vescovi <m.vescovi@revese.it>
Sat, 31 Dec 2011 11:18:00 +0000 (12:18 +0100)
committerMatteo F. Vescovi <m.vescovi@revese.it>
Sat, 31 Dec 2011 11:18:00 +0000 (12:18 +0100)
commit081de111d3f2385f20ee58398bdcef8d5561f8a7
tree31e783ceb16d681baf1f5e24975690114699a4e4
parent687c328195b9b658e4badcc5e35b544d378ddd74
parent9ff90938886116261a5775b702a1044b0d26ff1d
Merge commit 'upstream/0.1.6' into experimental